add XEN_LOCALVERSION to the dist building process

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/Makefile b/Makefile
index 3b50ec6436790ea3b0299079aeb23cc09931940a..d77ddbd57fea997fded981f5b0613a53bd33e177 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ INSTALL               := install
 INSTALL_DIR    := $(INSTALL) -d -m0755
 INSTALL_DATA   := $(INSTALL) -m0644
 INSTALL_PROG   := $(INSTALL) -m0755
+XEN_LOCALVERSION:=
 
 KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
 # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
@@ -18,6 +19,7 @@ KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
 XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
 
 export DESTDIR
+export XEN_LOCALVERSION
 
 # Export target architecture overrides to Xen and Linux sub-trees.
 ifneq ($(XEN_TARGET_ARCH),)

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 1b8a0ff1e0084006c8eba9106d157899511e01d9..02a29f0ef710d453521f31ccdd98dc5feee02256 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -7,6 +7,7 @@ LINUX_VER    = 2.6.12
 EXTRAVERSION = xen
 
 LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
+LOCALSTR     = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -15,10 +16,10 @@ include buildconfigs/Rules.mk
 # The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
        if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
-           $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-           $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+           $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \
+           $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
        fi
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+       $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
        rm -rf $(LINUX_DIR)

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 3dc195eb05128ba10048b14422902015337557ac..2dae91d6d41861fb8f89575d0ecdd796e8b0e869 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -7,6 +7,7 @@ LINUX_VER    = 2.6.12
 EXTRAVERSION = xen0
 
 LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
+LOCALSTR     = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -15,10 +16,10 @@ include buildconfigs/Rules.mk
 # The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
        if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
-           $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-           $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+           $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \
+           $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
        fi
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+       $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
        rm -rf $(LINUX_DIR)

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index c45f059f8ca7211c285aac17bc11013f47ccb1a8..f0a184a0cb19b229a0b9371abf2eec6cafca9f91 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -7,6 +7,7 @@ LINUX_VER    = 2.6.12
 EXTRAVERSION = xenU
 
 LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
+LOCALSTR     = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -15,10 +16,10 @@ include buildconfigs/Rules.mk
 # The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
        if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
-           $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-           $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+           $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \
+           $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
        fi
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+       $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
        rm -rf $(LINUX_DIR)

diff --git a/xen/Makefile b/xen/Makefile
index 58eb34a88ab8690186f3d06528d1f53901e429d9..5e0eb35ce44b05514ca879e5b4b6babdabf11aea 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -11,7 +11,8 @@ INSTALL_DIR           = $(INSTALL) -d -m0755
 export XEN_VERSION       = 3
 export XEN_SUBVERSION    = 0
 export XEN_EXTRAVERSION  = -devel
-export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
+export XEN_LOCALVERSION  =
+export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)$(XEN_LOCALVERSION)
 
 export BASEDIR          := $(CURDIR)
 
@@ -32,6 +33,7 @@ build: $(TARGET).gz
 install: $(TARGET).gz
        [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
        $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz
+       ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_LOCALVERSION).gz
        ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz
        ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz
        ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz